Detect pacemaker version and conditionally run test_check_cluster_configuration #287
Conversation
e2e_test/hawk_test.py
Outdated
| @@ -152,7 +156,10 @@ def main(): | |||
| browser.test('test_remove_clone', results, clone) | |||
| browser.test('test_add_group', results, group) | |||
| browser.test('test_remove_group', results, group) | |||
| browser.test('test_check_cluster_configuration', results, ssh) | |||
| if pacemaker_version < "2.1.8": | |||
There was a problem hiding this comment.
it is OK for me, but notice that the comparison of version strings is different with string comarison
There was a problem hiding this comment.
Yes, thank you for the reminding!
I did some test as following, hope that can match the comparison
>>> "2.1.5+20221208.a3f44794f" < "2.1.8"
True
>>> "1.1.24+20210811.f5abda0ee" < "2.1.8"
True
>>> "2.1.7+20221208.a3f44794f" < "2.1.8"
True
>>> "2.1.70+20221208.a3f44794f" < "2.1.8"
True
>>> "2.1.8+20221208.a3f44794f" < "2.1.8"
False
There was a problem hiding this comment.
Some of the libraries are already using LooseVersion from distutils.version. You can perhaps use that one:
acarvajal@airfox:~/git/hawk/e2e_test [master|✔] > python3
Python 3.6.15 (default, Sep 23 2021, 15:41:43) [GCC] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> from distutils.version import LooseVersion as Version
>>> Version("2.1.5+20221208.a3f44794f") < Version("2.1.8")
True
>>> Version("1.1.24+20210811.f5abda0ee") < Version("2.1.8")
True
>>> Version("2.1.7+20221208.a3f44794f") < Version("2.1.8")
True
>>> Version("2.1.70+20221208.a3f44794f") < Version("2.1.8")
False
>>> Version("2.1.8+20221208.a3f44794f") < Version("2.1.8")
False
There was a problem hiding this comment.
According to the document, I think the string comparison is acceptable for current situation.
https://docs.python.org/3/tutorial/datastructures.html#comparing-sequences-and-other-types
There was a problem hiding this comment.
rpm -q --queryformat '%{VERSION}' only get the version string, we don't need to consider release string, the current comparison is acceptable in most cases(I checked the history of the version string, only included number and dot letters), but we also need to avoid the case like:
2.1.8 > 2.1.10 is true
There was a problem hiding this comment.
Thanks! Yes, let me research a better solution
There was a problem hiding this comment.
Good point @badboywj . Look above at the tests I did with LooseVersion that it correctly returns False when doing 2.1.70 < 2.1.8 :)
There was a problem hiding this comment.
Thanks Alvaro and Jun, I update commit to use the followed method to compare package version, how about you?
zypper -t vcmp 2.1.8 $(rpm -q --queryformat '%{VERSION}' pacemaker)
There was a problem hiding this comment.
Sounds great. Good finding.
There was a problem hiding this comment.
LGTM. My only worry is the version check as pointed out by @badboywj
Dawei-Pang
force-pushed
the
check_pacemaker_version_conditional_run_test_check_cluster_configuration
branch
from
3482a5d to
ef759d4
Compare
Refer to #276, test_check_cluster_configuration can works since pacemaker 2.1.8.
Add pacemaker version detection, so that the latest code can correctly with early version pacemaker: skip testing with the pacemaker version less than 2.1.8
VR: http://openqa.suse.de/tests/15389026
The followed docker image with this change is used in this VR
registry.opensuse.org/home/dawei_pang/branches/devel/openqa/ci/tooling/containers_15_4/hawk_test:latestGenerated in https://build.opensuse.org/package/show/home:dawei_pang:branches:devel:openQA:ci:Tooling/hawk_test